From: oreo639 <oreo6391@gmail.com>
Date: Fri, 1 Jul 2022 19:16:56 +0000 (-0700)
Subject: ibusManager: Don't use GNOME_SETUP_DISPLAY
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~461^2^2~291
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4097f9f8360839c553f7056279f3640a21733c55;p=gnome-shell.git

ibusManager: Don't use GNOME_SETUP_DISPLAY

GNOME_SETUP_DISPLAY is only necessary when using xwayland on demand,
which is only supported on systemd, in which case you should consider
using the user service provided by ibus.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2345>
---

diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index 55c0d308b..c1e73d008 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -93,12 +93,8 @@ var IBusManager = class {
     _spawn(extraArgs = []) {
         try {
             let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
-            // Forward the right X11 Display for ibus-x11
-            let display = GLib.getenv('GNOME_SETUP_DISPLAY');
             let env = [];
 
-            if (display)
-                env.push('DISPLAY=%s'.format(display));
             GLib.spawn_async(
                 null, cmdLine, env,
                 GLib.SpawnFlags.SEARCH_PATH,